Fix for 9312, 8598, 9211, 10870