Merge pull request #971 from tobiasd/20200329-fr