Merge branch 'jc/pretty-lf'