Merge branch 'hotfix/missing-methods' into develop