Merge "Follow best practice for listener notification"