Pass original file name to preserve file extensions.
Merge branch 'hotfix/0.21.11' into develop