Test merge of tfc_b and dave master