1.6.x upgrade

commit my code for 1.6.x