Merge "context_hub: Fix version defines" into nyc-dev