Try to avoid overriding model properties if they shall not be saved (see #6506)