Tom> Along the way this fixes PRs 9715 and 19132. Oops, I missed a couple mauve fails related to 9715. I'm going to hold off checking this in until I investigate those. Tom