Merge branch 'rds-fixes'