backport-1.7-3929

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