Merge branch 'ph/maint-quiltimport' into maint