Merge branch 'gerrit/trinity' into 'master'

Change-Id: I0eb6d956f60cafd0829b756dc4956bcc9d187e75