Aligned with WFK 2.4.0 but keeping community versions