Added tag 1.7 for changeset 5cfd220cee60