specifying a default value implies the param is optional
Merge branch 'develop_2.9' into develop_2.10