Updated develop and master

Change-Id: I5e7400090ee9aee62e27e6d92106ef145a00789f