Merge branch 'dev'

Change-Id: I22f19a14054fb6d7dc30fbad7b612b0fc3057201