Merge branch 'maint-0.4.3' into release-0.4.3