Sync the starter repo with that in the CW repo

[saturn691]

There was some last minute changes to the CW repo last year. There is a repo provided under repo with out of date changes. This should be synchronised or taken out.