[ALLI-1824]