GS-2669 RT

GS-2669 RT