Merge "Removed more FORCE INDEX clauses for logging"