Merge "Fix bug in the way an Event handles a bound thread." into oc-mr1-dev