Merge branch 'jk/pretty-reglog-ent'