Merge changes from topic "revert-26749194-revert-26719621-VJCEHBBDKS-LNFHOFFYCM" into main

* changes:
  Rollforward aslgen tests and more fields, fixing tests.
  Revert^2 "Adding more supported fields/logic to aslgen."
  Revert^2 "Aslgen tests"