MDL-36445 Fixes in default settings and invalid checkings