Merged from upstream to better diff