Reflected merge with version change, and fixed a typo.