Hotfix v0.2.1

Change-Id: I88607130882d64ac2a71d6d0e93d369b9641b381
Merge branch 'hotfix-0.2.1'

Change-Id: Ie8bff23bc3d8fad4d2f8abdbe31e59ab19c25853