VGRAY-7364-Edit