Squash commits add checkpoint 78045

Squash commits add checkpoint 78045

fix "sleepcoding" errors