Merge branch 'master' into nextgenv2

Change-Id: I8811bfd8fc132b9f515707e795bb6308e4bf263b