Merge "Stop relative branches for rolling project" into elalto