Merge "[RESTRICT AUTOMERGE] Undefine NAN before defining it again" into main