AWS - RDS support
Merge commit 'c05e5b5'