backport some strings to stable7

supersedes #12322 and #12324