LPS-42257 breaking integration test for this bug.
LPS-42257 minimal fix for the exact problem.
LPS-42257 improve the code quality by removing unnessary dependencies to missleading code