Merge "ASL version-based validation of required and unexpected fields, part 1" into main