Release branch 0.2

Change-Id: Ic0ac0b0b3fcfaf7a12844d48698db2fae2dbd26f
Merge remote-tracking branch 'origin/release-0.2' into develop

Change-Id: I06d48c92006fda8916f281bc5d0e1b63ccf115f3