Merge "Revert "Revert "Extend extension support"""