Merge "A little more on issue #30766518: Document what targeting N does" into nyc-mr1-dev