Merge "fix the way last insert rowid is returned"