update for v3.1 rc4