Merge pull request #105 from pradpnayak/UCCPAR-455

-- UCCPAR-455
-- UCCPAR-437
-- UCCPAR-437