Merge branch 'hotfix/fix'
fix
Merge branch 'hotfix/fix-for-method-resolution' into develop