Merge "Fix headings and code-blocks formatting"