ref: refs/heads/issue5854_2
