Merge master into next

Change-Id: Ia895a6aa35e494c48bd45b77e10e63aedfb58793