Merge "ASL validation logic" into main