Backported #3416

Backported #3416 to fix a requirement in advanced plugin development