Merge branch 'es/pretty-describe-more'