reassert #12231 & #12232 (merge went badly?)