Added tag 3.2.1 for changeset f2cabc83a18f