restart of branch, this is to include changes from trunk


[SVN r40545]