issue #22067: review from github diffs