Merge branch 'dev'

Change-Id: Ia8b6f202ec4a829d02b1a05a09d611e9d7dc1e3c