Merged with TypeChef 3.4