Merge branch 'dev'

Change-Id: I0f01e3dbe45df0dcf714cb8d7c3a86f7abefb010