Merge branch 'hotfix/lib'