Merge branch 'maint-0.4.7' into maint-0.4.8