Merge branch 'rs/test-ctype' into next