Bug fixes including #8683 where a class would not be attributed to the wrapping UL element.