Merge common code changes