Merge with upstream
Update modules for file_t merge into unlabeled_t.
Merge with upstream