Merge base updates into fork