Merge branch 'pretty' into commerce