render proper json for swagger with auth
Merge branch 'develop_2.9' into develop_2.10