I merged to it latest develop, it was only a few minutes of work.  Other than the deserialzation thing in the FSM, everything merges cleanly and works fine.