Merge branch 'cocospec_to_be_merged' into unstableMainly adapting to new cocospec syntax for contracts
Merge branch 'cocospec_to_be_merged' into unstable
Mainly adapting to new cocospec syntax for contracts