Merged SVN r597, r598