Merge "BUG:6743 switch to clustered data listener"