Prepare 2.5.17 release
Prepare 2.5.18 development