Issue #20522

Squashed commits from bug fix; added requested docs