Merge "UploadStash us_props fix for Postgres"