Merge branch 'listener_refactor'