Merge branch 'dev'

Change-Id: I3ec09b2478a07988f8d2a53ade9c8e9afacca3e8