core and contrib update