Merge "Mark bucket as condition_unknown properly" into rvc-dev