<!-- For Security Vulnerabilities, please use https://pivotal.io/security#reporting --> ### Summary Backport of #6144