These changes are also in upstream???