backmerge a few more fixes to 1.7.1.X series