Merge branch 'md/exclude-promisor-objects-fix-cleanup'