(#2867) - don't stack notify change listeners