SP-392 backport of PDI-10242
Merge pull request #118 from kolinus/SP-392

SP-392 backport of PDI-10242