Merge branch 'sp/emfile'