Merge master into next

Change-Id: Iea7e230dae69d3b00506794ea8387045b29ab59b