LRDOCS-497 Backport to 6.1.x