Merge "Fix filename extension"