Merge "Bug 561026 - Add spacing after the content"