SeeRM #8436 SeeRM #8668 The fix for #8668 is more surgical than the previous fix for #8436, and may prove to be more useful