LPS-30341 Readd with JDK6 compatibility