Merge branch 'feature/file-size-checking' into 'develop'