but in 58dc3f70 the merge was not correct enough (it cause the drillDownIcon displayed repeatedly in some case).
So fix it according to 8c2267d4. And add the missing test case.