* Bugfix: Code type caused crash
Merge branch 'develop' into release