Manually merge content range check from v3