RF-13472: propagate the fix to all other *ListenerHandlers