Fix sms sending errors
Fix missing hidden question issue
Merge branch 'master' into dev
Merge branch 'MH-574' into dev