Merge branch 'dev'

Change-Id: I44eb5537b6160a6d956da95764e8a2bdc36a20d9