Fix leaked file manager
Merge branch 'sandvox-2.7'