changes & fixes related to some core upgrades