NB8 merges

Change-Id: I3f47f937995e2d76fb786b215fe1aba9575be657