TODO: Confirm whether the issues reported here are resolved by the fix for bug 1855931, combined with Galen's WIP branch above.
TODO: Confirm whether the issues reported here are resolved by the fix for bug 1855931, combined with Galen's WIP branch above.