Merge branch 'maint-0.4.4' into release-0.4.4