Merge branch 'OTF387'
Fix namespace class refs in auth filter