Merge branch 'dev'

Change-Id: Ied1651a82e9a4831baacf0516ae430c066639692