Merge branch 'dev'

Change-Id: Ib0ae99ccee2b9366f6342e6064e2bd0a2bfe6052