fix pypo not auto restarting
Merge branch '2.3.x' into 2.3.x-saas