Merge "Make sure fd is always initialized" into oc-dev