re #10095 revert from develop
Merge branch 'feature/10095_speed_up_ISIS_LiveListener' into develop