Merge pull request #8418 from tobiasd/20200313-ru