Merge branch 'hotfix/method_one_fix' into develop
method_one_fix
Merge branch 'develop'