LPS-37346

Hey @jonmak08, this branch fixes a customer escalation. It should be a clean backport to ee-6.1.x If you have any questions about why I made these changes, let me know. Thanks ^^