Merge "Normalize use of "INNER JOIN" to "JOIN" in database queries"