LRDOCS-952, LRDOCS-930