Merge "Revert "Extend extension support""