Merge branch 'la/quiltimport-keep-non-patch'