Merge branch 'dev'

Change-Id: I4513fa48b2e640017bf0a634e7ece4dbb1c3f71a