Merge branch 'as/subtree-with-spaces' into maint