Merge "Fix ueb listener config"