Auto User Ok
Remove phone number
Remove phone number
update test cases
Put greetings back into schema
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into Quick-fixes