Merge branch 'rs/test-ctype'