commit dia 25-05