fixes slow query
Merge branch '2.5.x' into 2.6.x
solve slow query
Merge branch '2.5.x' into 2.6.x