Merge branch 'dev'

Change-Id: Id1c06d8026e061bb4e03aa4bb3fa643b02708615