avoid a warning for model without type
backport enhancement from master branch
update expected results
document lastest changes