Merged from orig