Update for SPR-10374