=htp #15920 fix test-case broken because of merge conflict