Mixture of typescript and carbon versions, corrected


31913776