CLSN-1798 : all steps done. need testing.