Null merge branch 'gerrit/trinity' into 'master'

Change-Id: I0654da8bfcc6a7bdb415c58bfd7026b4f3843d88