Introduce some listener abstract classes
Fixes #1404
Fixes #1404
Bump
Prevent unexpected scenario
Fixes #1406
Improve fix
Formayt