Cos7 development into Master