Issue 20172. Completed
Fix admin rights
Merge branch 'development'