Added tag 2.3.5 for changeset 28a5466a87ed