Merge branch 'hotfix/2.2.14'
reset_upload_message
Phone no on devices not uploaded
Merge branch 'feature/admin' into hotfix/2.2.15
Merge branch 'hotfix/2.2.15' into develop