Short-term mitigation for security vulnerability #1754 and invalid memory access #1756.

Short-term mitigation for security vulnerability #1754 and invalid memory access #1756. #7132