Merge tag 'rel/1.7.4' into 1.8