Merge "81748: Add an annotation to track the dimension unit" into nyc-dev