LRDOCS-464 (6.1.x)

Backported and ready for 6.1.x. Thanks.
@codyhoag