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

Ext-ref: MB-67160
Change-Id: I970c2764c783fb6680a213685be1e842dcf34913