Merge "Sonar-TypedCode.java"