* Combine * migrate test models segs * fix highlander engine * no change old-commit-hash: 29536324c1dceceb064c6b3ef6a3e0ef3dd0d578
* remove PyYAML package * remove those * add comments back * fix lock * fix those old-commit-hash: bc54ed794b2cd9dcb9522cdeb241ad78ac30d998