bugID:68841 - Need underscores on namespaces
Merge branch 'bugid-68841' into release-146