More specific namespace exports
Merge branch 'master' into development