Modify security, separate zoolu and customer namespaces
Merge branch 'bugfix/133II' into develop