merge upstream

FamilyBasedVsSampleBased was not compiling. Had to change temporarily till it is fixed upstream