Update after 2nd code review and rerunning unit, integration and qual tests.