PRD-4625: Test and fix