Added tag 0.7.21 for changeset 4f4005787aaf4714a42a06811b1d1caf6e08af9f