Merge branch 'hotfix/meta'