Merge "Fix use try-with-resources sonar issues"