Remove compiler warning. re #9137
Merge branch 'feature/9137_large_files' into develop