Merge branch 'dev'

Change-Id: Icc746729170e28a6da5e892c8c726fb3991c7d16