Proposed PR: #2915
Proposed PR: #2915