SP-983 backport of PDI-11082
Merge pull request #317 from dbahdano/SP-983

SP-983 Backport of PDI-11082