Backports the @ symbol escaping fixes
Merge remote-tracking branch 'origin/6.2.3' into 7.1.7