Merge "Bug 2245 - OFJava corresponding change (Sonar technical debt)"