Merge tag 'v3.3.7' into 3.3/master