Merge branch 'dev'

Change-Id: I73594428b2627abc04d2e110f7fc3edea7bfeaa5