Interchange cvar settings in 5.4

Please refer to that answer