Set to branch 1.6-upgrade