Fix for SPM
Merge branch 'hotfix/v0.81'