Merge branch 'gerrit/neo' into 'gerrit/trinity'

Change-Id: Ibc8b950df72b969008f40c622230a0cfa52d449c