Backport-1.8-3929

Backport #3929:`added spaces to literal string concats`