Merge pull request #9034 from tobiasd/20200819-lng