v3.1.2-emergency-fix