re-applying changes from PRs which have been overwritten