Merge "Fix crash in test" into oc-dev