added before auth filters
Merge branch 'develop'