Merge master into next

Change-Id: Ifdf866a19534a9df2454a9c0f2d139b1db3beb40