Merge "Fix API output formatting (change lines delimited with * as bold)"