Merge "Add support for file descriptors and vectors thereof"