Merge "CSIT version variance handling"