Sync with evaleev/BTAS after introduction of CoRange.