HHH-8390 generate FK after UK