The commit to apply, from upstream repo, is:
a35858f040
But it doesn't apply clean to our current 1.8.0 version.
So we have ended a slightly different version in core reproducing the same changes.
Note this is different from the upstream commit:
a35858f040
because it was conflicting so only the cases corresponding
to our current 1.8.0 version have been modified.
This commit is trivial, just a pure curly to square replacement.