Merge "Fix literal code-block formatting"