GNETIC-11525

GNETIC-11525