Merge pull request #108 from pradpnayak/UCCPAR-455

-- UCCPAR-437
-- UCCPAR-455