JAVA-1475 and JAVA-1465