SP-1019 - Backport of PDI-4910
Merge pull request #394 from dbahdano/SP-1019

SP-1019 - Backport of PDI-4910