Merge "Extension API: extend the API surface to include more inputs" into sc-dev