Merge branch 'master' into nextgenv2

Change-Id: I4e5dd38caa9608252235265c7f2342b183f99815