Release 1.6.17

Added 5926