Merge branch 'jims/bug/JAL-4298_java_console_causing_hang_at_startup' into develop