trunk@7626 backported