Merged from github