Merge "Fix index in PostgreSQL schema"