Merge SyntroLog changes from Pansenti