[SP 518] -  Patch request for PDI-10554 (5.0)