Merge "Fix ChangeTagsTest failing on Postgres"