Update branch handling based on discussion with Rushi