Merge "Function.java - sonar fixes"