Merge branch 'F8012VariableNewEscapeTokenStopFurtherReplacement' into 'master'

Fixes #8012: Stop replace of embedded values

See merge request !135
1 job for master in 2 minutes and 5 seconds (queued for 3 seconds)