SOS-1003
SOS-1003
SOS-1531
LPS-35612 - The window is too narrow
Revert "LPS-30341 Revert broken tests"

This reverts commit 2270eddb62cc730f07512e942f03c67b96cef594.
LPS-30341 Readd with JDK6 compatibility