Merged from develop

Change-Id: I197c240e69a2fdf6e38a84fde8e1394a564772de