Update develop and master

Change-Id: I1f87dd6c0908e15cf51f26c72ebbcd4535841d23