masaki undo transfer hot fix
sms-version-2 done
Merge branch 'sms-version-2' into v1.21_Release