Jim's changes same line as Dmitry'
Finished resolving merges (manually).