add changes for proper CS Auth work
Merge branch 'develop'