Just before merging cpsfoo
cpsfoo merged with cps2