Almost ready for rc-2