Resolves #12712

Auditors:

Test Plan: