Merge master into next

Change-Id: I639f7e40efecb3cb5ab461fec985a8bff0d1ce86