This is caondidate for release 2.6.0