[System]: Partially fix #12393.