GNS-11870

GNS-11870