Merge branch 'rs/ctype'