Merge branch 'listener-refactoring-preparations'