I'd keep number of changes minimal, since it might be not last time we syncing with upstream.