first draft for 3.6.0 release n&n