Merge branch 'jc/majordomo-to-subspace' into maint-2.43