[MNG-5719] take the case change into account