LRDOCS-382 (6.1.x)

Ready to merge into 6.1.x. Thanks.