LRDOCS-621 and LRDOCS-623