Merge "remove specific FORCE INDEX clauses causing trouble"