Merge branch 'release/release_one'
Added missing file
Merge branch 'hotfix/file_missing' into develop