SP-787 - Backport of PDI-7070
Merge pull request #404 from dbahdano/SP-787

SP-787 - Backport of PDI-7070