LRDOCS-514 Backport fix to 6.1.x