Merge branch 'fix/normalize-file-extension' into 'develop'