Add files env
Update change log
Merge branch 'files'