Merge "BUG-731 : refactored stateful listeners"