Former-commit-id: e77b64bb90d849d856d93426a68b4d76cb499971
This will protect some memory-related code from new redefinition Former-commit-id: 337e69e70acd0bf8dbc3ba1657c6bb0bddfd5df4