Fix 1.2 integration