GIN-3942

GIN-3942