EZP-22662: move settings to Core pt. 2