SONAR-4069 improve ScanTask