Merge listener changes to build