Merge svn

Merge SVN RGAA 7.1