SP-517 - Backport of PDI-10503
Merge pull request #416 from dbahdano/SP-517

SP-517 - Backport of PDI-10503