Merge branch 'fix2204' into maint-0.2.1