Merge latest Core into PSI branch