Release candidate merge from cf