Merged from hgomez