FS-5360 change defaults