Merge branch 'listener_refactor_part_15'