This is a follow-up to #1381 and #1743 — the latter initially included all necessary fixes, but they were rolled back to ensure simpler merge scenarios, considering that numerous AI-generated fixes were applied at the same time.