CLSN-1479 code review till 14th sep - kapil
Merge branch 'master' of https://github.com/algosystech/collosys