v3.9 - Final policy changes