fix to PDI-9790 improper merge/rebase
Merge pull request #261 from prakapenka/fix_9790

fix to PDI-9790 improper merge/rebase