Three-way Branch (#3568) - Basecamp