Merge branch '21.0_AODReductions_ObjectThinning' into '21.0' See merge request !2770 Former-commit-id: 8684e25f