#14595 Made numerous changes to settings according to Vladimir feedback