Merged from external project: