Hotfix v0.2.1

Change-Id: I88607130882d64ac2a71d6d0e93d369b9641b381