align with latest SB snapshot