FAKYZIN-1715

FAKYZIN-1715