[1.6.x] Insert space.

Backport of 8eb51a8cf6 from master