#84757124 fixes merge bug