Merge branch 'gs/pretty-hexval'