This might need to get bumped to another branch like core-packages-team (if accepted), but that was just merged iirc.

- Jordan