[Users] SPM problems after upgrade to 3.1