Merge master into next

Change-Id: Ib8fed701150d0f66e882e6e5ede90c3a471e509e