Update D3652 with CWG review comments and rename to N3652.