PLATFORM-392 Beginnings of improvements to Java