Evergreen 3.0 development update #10