Start of v2.5.1 development