Merge "FIx Sonar Issues reported on ActionPolicyController"