sms-version-2 bugfix done
Hanging transactions fix, WIP
Merge branch 'sms-verions-2-bugfix' into v1.21_Release