Merge "Do not override bounds when task override exists" into main