Added tag 0.21 for changeset fe3c45a3a97f