merge in 3.10.40 suspend code
SOD Fix test