final polish for 3.6.0.M1 n&n