Merge commit 'upstream/1.7.4p5'