Merge recent pull request changes into snapshot branch