Created by: reyoung

Related issue #8368 (closed)

This PR can hotfix that issue, however, the complete fix is PR #8377