Merge branch 'dev'

Change-Id: I85cee89e608696f0a9c9ceb2a2edc766e3226b3f