Lrdocs 1019 qa

This branch is for both LRDOCS-1019 and LRDOCS-1021 tickets since they were both in the same pull request from Cody; the commits are labeled accordingly.