LRDOCS-1408 Simplified