draft N&N for 3.6 M3
4 files changed