Sundry core and contrib upgrades`