Merge branch 'va/i18n-remote-comment-to-align' into maint