update: format changes only
update: allow to update myAddress for email and keyword for SMS
removed warnings
Merge branch 'NewInfraBranch'