Merge "Fix INSERT options for PostgreSQL for INSERT+SELECT"