Applied fix from upstream: e810ceb1220adb3a0c9d21808f22f8bd496cb5fe
(promotions)