PRD-4648 - patch merge, PRD-4776 - Verify case via test