Merge branch 'master' into nextgenv2

Change-Id: I63dc39d1ec9ad2e2454da6f5956dcd4367b87190