Merge "Avoid locking aggregated SELECT in Category::refresh"