use unlimited dimensions so aborted scans are reasonably recorded
Merge branch '8.32'