Merged from 'devel'