SONAR-5877 Fix adding manual issues