Plugin core fixes for instance variable reload cycle