Merge master to RDS