Merge "Fix int/dist version in AR"