More specific namespace exports
Merge branch 'master' into development
Merge branch 'master' into param
Bug fixes