My team is facing the same issue today as well