fix for MERCH-52
Merge pull request #2 from vijaysali/1-3-stable

fix for MERCH-52