Merge branch 'master' into nextgenv2

Change-Id: I6f8b540854ddc78fc4a2a8045b194a888749a3cb