Merging with similar changes by Scott S.