Merge in code reviewed changes