PRD-4849 Fix for 5.0