Fix autosync namespaces
Merge branch 'develop'