Merge pull request #48 from pradpnayak/UCCPAR-431

Uccpar 431
-- for #d in UCCPAR-431