Sync tmfcore to bassosimone/tmfcore@0bf80c4579