CLSN-1798 : all steps done, need to check tagging code.