Merge branch 't/misc/quot-hex' into refs/top-bases/master