Added tag 2.8 for changeset 107719a9ce3bd0c79f9f1f626596eb338a276561