Picks up fixes for #11150, #11151, #11323, and #11327.