5.1-FIX2 Production Hardening
