Merge branch 'wp/pretty-enhancement'