Added tag 3.5.2 for changeset c16fca99590c