Added tag 2.3.4 for changeset 6d1dc8e185c2