[LADY-438] LADY-438