backporting - applying patch form HIVE-5181
Merge pull request #10 from VertiPub/js-DP-157

backporting - applying patch form HIVE-5181