DEV-116 | problems related to virtualbox guest addition
Merge branch 'bugs/DEV-116-problems-related-to-virtualbox-guest-addition' into develop