ensure listener functionality + change in listening logic

Merge request reports

Loading