SP-282 Backport for PDI-10113