Merge "asl updated fields part 2" into main