Merge "Fix invalid bubble predicate once and for all" into rvc-dev