[TIDOC-1010] Second Revision -- address PR comments