LPS-49784 Make it possible to be tested (rollback after review)