Pre switch to Java commit