Merge branch 'dev'

Change-Id: I8083ab4bdb43a542d6bc5bb764dd7ca00f7a6051