use a real type for default value
Merge branch 'develop_2.9' into develop_2.10