Use specific methods for each type of param
Merge branch 'develop_2.9' into develop_2.10