SP-204 - Backport of PDI-9844
Merge pull request #415 from dbahdano/SP-204

SP-204 - Backport of PDI-9844