Merge "Spatializer: minor fix for bpfmt warning" into main