Merge master into next

Change-Id: Ie34316481e85cf477e0ba3b8f3a5cc663bdc2393