LPS-45003 namespace group because it can conflict, unlike the other ones - from mhan
Revert "LPS-45003 namespace group because it can conflict, unlike the other ones - from mhan"

This reverts commit 21a3eb7c7e8468830647661d565720aacfe6646e.
LPS-45026 Removing unused parameter
LPS-45026 SF