Fixed an issue with incorrect namespaces present
Merge branch 'hotfix/computed-field-namespaces'