Adding missing file extensions
Merge branch 'v3.0'