Merge pull request #1852 from Montellese/ra_fixes