Cleanup 13508
Merge pull request #2553 from monarchdodra/13508

Cleanup 13508