listener output fixed
Merge remote-tracking branch 'origin/4.2.x' into wfk21