Merge "Fix the compatibility matrix with range"