Made in/out event watchers be pulsed upon error mask.
Merge branch 'v1.4.x' into sam_639
Merge branch 'next' into sam_639