Task #8758: merge from branch RA-Task8758 to trunk. svn merge did not work, so I used svn diff on branch and svn patch to trunk. For revision history, see branch.