Resolve #3020883 "Context provider v4"

Kristiaan Van den Eynderequested to merge
issue/group-3020883:3020883-context-provider-v4 into 4.0.x

Closes #3020883

Merge request reports