Merge "Function.java-sonar fix"