Merge "Rename Ext to Extension" into main