Merge pull request #5766 from tobiasd/20180917-lng