Merge: #23700: fix/improve comment