[TO_STAGE} Part 1 of Card 536

This change needs to be put in production prior to release of sprint 26. So there are no pending namespace change requests by the time the code for sprint 26 is released.