Changes merged from upstream