Merge "Switch to new incompatibilities targets"