Merge branch 'master' into develop
update naming of generic parameter
Merge branch 'develop'