https://github.com/bevyengine/bevy/pull/18427 left several important supporting tasks to follow-up: