Prepare 2.5.18
Prepare for 2.5.19 development