Merge "Extension overhaul."