Formatting of content from b1db615 [ci skip]