Revert "LPS-38165 Revert as it is breaking the build"

This reverts commit be73bd7d72e6b67ae615048447c6cbebfb26afd7.
LPS-38165 Fix the failing tests
LPS-38165 SF