Merge branch 'dev'

Change-Id: I8f45de0583cb6969c5fe400b705ce9eb71752f93