Updated to upstream version of 840869