Added tag 3.7 for changeset baee494346e5