This is a tracking issue for the fourth merge of feature/extensions into main.
Note: The PR and commit below will be updated if more PR's are merged before this issue is closed.
PR/Commit to Cherry-Pick:
This merge contains the following PR's in addition to the one above: