Merge branch 'dev'

Change-Id: Ib75266d3ecbe7bac55387be04c041913bc8e2d7c