FCSimplex branch merge