Merge release 0.2.2 into master
Backported release 0.2.2 into develop