# Objective
- Fixes#13825
## Solution
- Cherry picked and fixed non-trivial conflicts to be able to merge
#10839 into the 0.14 release branch.
Link to PR: https://github.com/bevyengine/bevy/pull/10839
Co-authored-by: James O'Brien <james.obrien@drafly.net>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: MiniaczQ <xnetroidpl@gmail.com>
Co-authored-by: Carter Anderson <mcanders1@gmail.com>
