v3.7 - Policy updates