Merge branch 'eb/unpretty-b-format'