Merge "Limit recursive volume calculation" into main