Merge branch 'hotfix/v0.5_hotfix'
Merge branch 'develop' into hotfix/nexdesk_v0.6_hotfixed
Merge branch 'hotfix/nexdesk_v0.6_hotfixed' into develop