map listeners revised, remove by id
Merge remote-tracking branch 'origin/3.0' into 3.0