
with fixes needed for further migration also revert back jvm target to 1.8 (cherry picked from commit 3fb42b6ce944d5a2ec9b0cc1c7f6a157807cf596)
with fixes needed for further migration also revert back jvm target to 1.8 (cherry picked from commit 3fb42b6ce944d5a2ec9b0cc1c7f6a157807cf596)