Merge branch 'dev'

Change-Id: I92b14044b8beef37eb15f1211d1e39a910dc88e0