Please take a look at the revisions in Grant Sec 3.3.1, 3.3.2, 5.7, and 6.2 (guided by this commit) to see the proposed text for #358 sub-issue (b).