SONAR-3755 Fix issue when tracking issues
Merge remote-tracking branch 'origin/master'