LRDOCS-477 Incorporate Julio's feedback