Merged SVN r500 thru r509.