[ALLI-1824] (third attempt).