Merge branch 'hotfix/NullRefExOnDrop' into develop
Improved rendering of visual
Merge branch 'develop'