Merge "Changed FOR UPDATE handling in Postgresql"