Merge master into next

Change-Id: Iea6ea32e859d1e5fd6c9c8873b0e69f0a163f43d