Merge master into next

Change-Id: I7ef17c94cdb2b4b0bfa4d5b4ad4cc94787a36ea4