Merge branch 'dev'

Change-Id: I7a6ede24163affc30191b6a55d112010baa648ac