Merge branch 'dev'

Change-Id: I0d8514a5028c1849bf2de9aa0446a3f2b3963550