HAL-554 / BZ1173031: Fix loading settings