LPS-48104 Add missing code in refactor LPS-47568