master upgrade-ts21

v1.0.7 v1.0.6 v1.0.5 v1.0.4 v1.0.1