Merge branch 'hotfix-py'