Merge branch 'release/nexdesk_v0.5'
Merge remote-tracking branch 'origin/develop' into hotfix/v0.5_hotfix
Merge branch 'develop' into hotfix/v0.5_hotfix
Merge branch 'hotfix/v0.5_hotfix' into develop