Core update (summer plugin remix)