Fixing build break.
DOC-1198: Incorporated important tech review edits.