[APAA-419] APAA-419