Merge pull request #1035 from tobiasd/20201011-ru