Merge tag 'v3.7.1rc1' into 3.7