LPS-46031 Add missing listener
LPS-45000 Fix test
LPS-45766 SF after revert