Merge branch 'chardev' into devel