Merge "ApiAuthorizationCheckInterface-Fixed sonar issue"