Bring develop up to speed

Change-Id: Id5952550e72d7575786df3ac41d50cfd77556b88