Merge pull request #1095 from tobiasd/20210406-lng