Merge commit 'origin/maint-0.2.1'