Preparing for merge with upstream