Merge master into next

Change-Id: If4ac37a9aa9cca58101f742bb6be1c29bfc0dc6b