Merge "javac compatibility fix"