Merge change 8302

* changes:
  add account manager permission checking