Added tag 4.7 for changeset d6d3085307d8