Merged from 'trunk'