Merged from fork