Merge branch 'master' into nextgenv2

Change-Id: Ib050607fa5c0288360ff224fd048445d16568520