Updated for next release 3.2.5