Plugin miscellaneous fixes Upstream-commit: 23ea9e45fd6281e82c389e6112457a7bb70f8d89 Component: engine