Merge master into next

Change-Id: I2a7a5fd69e8fa0721d1249822e0c219ec48595bf