LRDOCS-463 Merged Jim's edit (commit 5896358) manually