It doesn't fit to our coding guidelines but at least it's working, so please bear with it for now. :) svn-id: r11687
svn-id: r11679
svn-id: r11664