Added tag 3.7.1 for changeset 9b422fc0b8b9