Merge remote-tracking branch 'char-misc/char-misc-next' into vme-dev