Merge master into next

Change-Id: Ib3eebb188a511cf8c77db303a5f1c826ed36eb72