Merge branch 'hotfix/v0.79'
Merge branch 'release/v0.8'
Fix for SPM
Merge branch 'hotfix/v0.81' into develop