Merge branch 'hotfix/nexdesk_v0.6_hotfixed'
Merge branch 'develop' into hotfix/nexdesk_v_0.5.2
Merge branch 'hotfix/nexdesk_v_0.5.2' into develop