[SP-788] -  Backport of PDI-10270 ...