Merge "Add lift to type support" into main