cherry picked 2 fixes, changed version to 1.6569