Advance tmfcore to bassosimone/tmfcore@1aae6d1