LRDOCS-1340 Edits based on Neil's feedback