Merge "Fix Login 1.6 JDK issue" into idea133