Merge branch 'hotfix/chg_files'