Merge "Testing changes for Refactor UEB Listener"