Merge "Fix small computation error." into main