Merge branch 'dev'

Change-Id: Ic89bdfb1e7c353ef4f72816419eea4a120e0db6f