Preparing branched code for merge with mainline