Merge master into next

Change-Id: I3dba154c02bb16fac2136d6fc72d07717463091d