Merge branch 'master' into nextgenv2

Change-Id: Id0b784b115602e2502b42fa972a5ae210435a3be