bugid-94793 : Fixing permission error for staff
Merge branch 'bugid-94793' into dev