Gets rid of thread block error in File plugin
Merge branch 'CB-5175'