Checking in FMU v2.4, as it ships now