Cherry-picks !15 (closed)
How it looks like:
Extra: fixes displaying formatted statuses (regression)