Merge "fix sonar - feature-server"