ref: refs/heads/issue5631
