minor changes to make force_branch_master optional (for BAL)