ref: refs/heads/issue5993
