Merge "Add check for empty RDS_PS." into pi-dev