Merge master into next

Change-Id: Idaaa780942e58202c06d3f3be36b8541fd5c8a6e