KFSUPGRADE-940 Fix configuration