SP-1025 - Backport of PDI-8986
Merge pull request #210 from dbahdano/SP-1025

SP-1025 - Backport of PDI-8986