Backport of fix for default namespace issue from 2.3
Reviewed by Blaise Doughan
2 files changed