Merge branch 'rs/hex2chr' into maint