MDL-20808 Fixing default param handling.