Merge pull request #2716 from arian/fix-2715-edge-ua-string