Merge "Working around bugreport crash issues" into oc-dev