Merge "Extend extension support"