core and contrib updates