Merge and sync with upstream