Added fix DO-4490
Merge pull request #200 from parthibane/master

Added fix DO-4490