Merge tag '3.7.0'