Fixes #32356 (closed) and fixes #32188 (closed). Still might need some work, and I might be able to simplify things further.
Fixes #32356 (closed) and fixes #32188 (closed). Still might need some work, and I might be able to simplify things further.