Merge "Fix plugin reloading for DynamicItems" into stable-2.10