Merge "Fix constraint usage for unmaintained/victoria|wallaby"