Align with recent changes in core