feature-OPAL-2594 - simplified code to have the same structure as other permission commands