Merge branch 'md/exclude-promisor-objects-fix' into maint