Merge "Fix "mutable" object as default value"