Added tag 3.8 for changeset 2fa97c06cc01