feat: #3554909 Narrowed typing regression for plugins

This MR is rebasing the changes that made by @NexusNovaz into 11.x branch. No changes in the code other than the new branch and target branch.

Closes #3554909