Merge pull request #994 from tobiasd/20200701-lng