Manual merge of ctf behaviour