Internal ref: #727