Merge branch 'hotfix/classloading-problem'
fixing type annotation
Merge branch 'hotfix/fix' into develop