Merge latest changes in branch 'develop' into feature/nextgen, all changes modified to use namespaces
