Latest core changes from Main