SP-1323 - Backport of PDI-12215
Merge pull request #233 from dbahdano/SP-1323

SP-1323 - Backport of PDI-12215