Merge master into next

Change-Id: I07dd9c3bd5b3aad60a40e7ec3c9ed3750f27945a