Temporary remove file open
Merge branch 'master' into production