Merge "HWC2: Change version detection scheme" into nyc-dev