Feature/upgrade core and contrib