Add N&N for 3.21M1

Signed-off-by: Nitin Dahyabhai <thatnitind@gmail.com>
12 files changed