complete sync. with MSC 1.1.x branch
[MSC-122] sync. with David prototype including listenerAdded method fix