Merged from develop

Change-Id: I3d9cc0d907092433d0389984b01b506b9aafef5e