Merge master into next

Change-Id: I20a332e3a9f5f69a3acb4808e82b68645ba2f48a