Update at end of regression testing after changes from code review 201