CX-035427: Adoption of Generic CX B2.2 Building and equipment instrumentation