LPS-29893 Make backwards compatible
LPS-34861

Revert "LPS-25621 Use fetchGroup + null check instead of getGroup + catching exception"

This reverts commit 1ea6582077f73540f9e40b971581807475de1e38.
LPS-34861

Revert "LPS-25621 source formatting"

This reverts commit 7a8d05e40d66c830cce0c28eb49ba02eabac26a5.
LPS-34861

Revert "LPS-25621"

This reverts commit f7bcaa2cabc8612abf8a5f0254ec890492a7c7f3.