Merge "Fix ConditionUnknown after valid buckets" into rvc-dev