Align to core changes