Added tag 3.5 for changeset 63ad05e7f9e1