CLSN-2110 on approval, capture the replaced by and change all the workings by the replaced by
Merge branch 'master' of https://github.com/algosystech/collosys