Merge master into next

Change-Id: Idbfaafca24fe36715ea5835b357eafcfd129c7b4