Merge PR #14473 with fixed conflicts

Giving this a shot, hopefully it will still show #14473 as merged automatically