Merge "Remove duplicate file extensions from output messages"