GABY-11289

GABY-11289