-- worked on UCCPAR-394, code cleanup and improvement
Merge pull request #2 from pradpnayak/UCCPAR-394

-- worked on UCCPAR-394, code cleanup and improvement
-- more work on UCCPAR-394
-- notice fixes and minor changes for UCCPAR-394
Merge pull request #3 from pradpnayak/UCCPAR-394

Uccpar 394
--worked on UCCPAR-353