Merge branch 'dev'

Change-Id: I5017e29b2ceb28ee55629a9dc359fd5ce83fb25d