comments to address reviewer feedback
Merge 2.10.x into master again (no conflicts).