Merge "GenericSource: close unused file descriptor" into oc-dev