Merge "Fix event listener timeout issues" into oc-dev