refs #31568
Merge remote-tracking branch 'origin/bugfix/note-l10n'