Readying release 2.4