This fixes #8053.
This fixes #8054.
This fixes #8052.
A test fix for bug #8052.