Added tag 3.9 for changeset 21a1ed9a69b9