Merge branch 'dev'

Change-Id: I39edb47df0c44966cb3782c06622dc3062fbcf9b