* Fix for #14622 Fix for a bad merge conflict resolution.
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>