For 1.7.16.1 release