Merge recent pull request changes into 1.7.4 branch