ref: refs/heads/issue5402
