Merge master into next

Change-Id: Ib8f7c08db6e5b011e5658e4501a565c30b7b65c5