Refine the implicit setting of the optional param
Merge branch 'develop_2.9' into develop_2.10