Added tag acora-1.7 for changeset d7259380eafb