#4001 Diagnostics regression from next branch merge

[Philipp Klaus Krause]

We have a regression in diagnostics in trunk. I caused it (first by the [r16574] in the next branch, then by merging the next branch to trunk). [r16574] was the fix for [bugs:#3998].