Merged documentation update for issue #12206.