Merge "Fix new sonar issues in RestManager"