Merge branch 'dev'

Change-Id: I4c2445b1a532cee0f940ad11a8d8aa7f9fddf3db