Merge branch 'dev'

Change-Id: I76b49f4c63b6d377026a7be4e097dfb645ad923f