Merge tag 'rel/1.10.7'