branches: 1.62.6; 1.62.12;Fixes from christos for pr-41167XXX -X is still broken, but that wasn't part of this PR.