Merged from original