Merge branch 'net-Update-static-keys-to-modern-api'