Merge "ASL allow DataType to be easily compared (for lint annotation logic)" into main