hot-fix release 1.6.17