prepare for 1.9.17