Added tag 2.5.0 for changeset 169f9afe2495