Merge "ExtractJar sonar issues fix"