Merge branch 'feature3049-v2' into maint-0.2.2