Branch force pushed by xurizaemon at 2025-03-12T11:12:16+00:00, 3258777-various-fixes moved from this tag to 7685a53e6a815872af7d35689f3daf73d11c4d42