Eng 2917 avg optimize

Jenkins should pass all tests... Waiting...