Upgraded to upstream version 3.5