LPS-48299 Fix Eclipse warnings
LPS-48487 Regen