reduce differences from upstream